Revert a7e02ae..ceb0432

This rolls back to commit a7e02ae8e4514d8ec2b22de821a506bf977f7892.