Revert d444d5f..c35e266

This rolls back to commit d444d5f1091f747d295c5d51b95cd10107444264.