Revert d4e4a00..c7c7608

This rolls back to commit d4e4a00c08e22456fdabcd2367f78fc6d41c2511.