Revert 3a9cf16..af3e7d9

This rolls back to commit 3a9cf164a0c50fdb81624f959fc3d813fd9d3c94.