Revert commit 6e0782e