Revert cf5d4ea..6087b24

This rolls back to commit cf5d4ea2f8d0dfdd61dc1f076786a453be81bd1d.