Revert commit 1a968f3394