Revert 70522be..5248eb0

This rolls back to commit 70522be7c415c8db4ecd802e534ec539a2c22c4a.