Revert dd03a9f..1e2d5c4

This rolls back to commit dd03a9fc874f207b2666770fcba2ad507b733eb5.