Revert adcb2cc..df944a2

This rolls back to commit adcb2ccbc934e3866214a79aeb20f852b8bd8e5f.