Revert e6194a1 and ccc9c51