Revert da979fb..38055e3

This rolls back to commit da979fbc1d248d60606e6db2a39fdd75f8ca0efb.