Revert 3eb8624..8fe1268

This rolls back to commit 3eb86244ca0f2021430108b312cd03cd07d3d30d.