Revert 78d27de..24d2e29

This rolls back to commit 78d27deaa72fae647ea12bf79f9b714a30f7f9c1.