Revert bf4adcf..c3c5f69

This rolls back to commit bf4adcfa9d6439b9a88f9f7dc0f6ed85931073b1.