Revert ee2ae1a..e33b65e

This rolls back to commit ee2ae1a0158afeedcac16035d9337099aa22e0d1.