Revert 0ef6e8b..7b9f38c

This rolls back to commit 0ef6e8b50e51343d15127b4d55cae621141ee8a6.