Revert ea09d03..aa6bea6

This rolls back to commit ea09d033acbe44b5c98bba4996bde3649a84931f.
Rollback