Revert 08e9f3e..5a083e9

This rolls back to commit 08e9f3ebd02ca28d9766be6bd4caa60ec77658e1.