Revert 9a39337..6bc7d19

This rolls back to commit 9a393371d8210fce3e7a0fea1538de73d2424401.