Revert 94eb7b2..3a67a26

This rolls back to commit 94eb7b2b1fd53b0756ef27f97f2485bd8994439c.