Revert ca5aa49..4278b73

This rolls back to commit ca5aa494f6e5ca9180bbcdeae11c0217be3ce45c.