Revert d52cf02..3be86ab

This rolls back to commit d52cf02f926bd12e87b02839e954259ddb5dbd75.