Revert commit 8b92bf1d42