Revert ecae42f..6501f92

This rolls back to commit ecae42fa576aad4c307eb549c5691235c826a35b.