Revert d2c4b4c..5cd9af3

This rolls back to commit d2c4b4c7ceabfaf2851ae15a73531279d01e3e67.