Revert d27e8af..425ebad

This rolls back to commit d27e8af098df414c93290c3f93507e68efb39c80.