Revert commit d782b3c361