Revert 01c88df..3d892f6

This rolls back to commit 01c88dfe145f20aaebf0c5e996127f0b18e1cc59.