Revert dda5be1..06ed0fe

This rolls back to commit dda5be114a8e841221ffcc66adbce07e5d7fc12f.