Revert commit 65ea2f3