Revert dab8d25..a75082d

This rolls back to commit dab8d253ad74fc403c127c23a726d357efa302b2.