Revert 10415f2..216f840

This rolls back to commit 10415f205f668ffc73dadcb314a085c69bb52ccc.