Revert to 06d603690f506244bab63d07bbb66269e72d9b51
Reverted back to before Devise