Revert commit 42f1950ac7