Revert 1ccb46e..b2e8430

This rolls back to commit 1ccb46e4af84f1ac9dff911af3044bde15a9341c.