Revert b720afe..c51d44f

This rolls back to commit b720afe79664bf24aa77f1def1a5149b0a7b53b3.