revert commit 9603