Revert b0c4839..5108ff0

This rolls back to commit b0c483917409f729e86504559124ac1568019b8e.