A note for S6 users b/c the Clear Credentials is a little more difficult to find.
Settings->Lock Screen & Security->Other Security Settings->Clear Credentials
This did work to make the Swipe option available to me again, & I noted it makes the Smart Lock option disappear (which i only found by...