Revert 5ac3135..e4aa78a

This rolls back to commit 5ac3135370137e160a0306e208c7dad2265ed7c2.