Revert fe61282..b4290a2

This rolls back to commit fe61282839de33a949bc9a872149a065655ca297.