Revert b8fe61b..1f7f501

This rolls back to commit b8fe61b36c87dd185f43cce2aa69bfb9f626e567.