Revert 1598a36..99f18ef

This rolls back to commit 1598a368182ffb0302ab68257b52f2609ac82ecd.
devise test