Revert dac388f..b396c15

This rolls back to commit dac388f2c17f935eabc86d46798f312e08068ee9.