Revert 1adceff..272f599

This rolls back to commit 1adceffb8d8eff3cbcaccb541c0cbe2e056c1d19.