Revert e00548f141