Revert commit ac78c13604