Revert 9ff3aef..89272c2

This rolls back to commit 9ff3aefcb379e994a7ef5f52c9f700c588073c3a.