Revert b19bb6d..e762639

This rolls back to commit b19bb6dd28daee29884ca9c8d1182efb18fa3c6a.