Revert e2edca4d11124fff14adbd048a9bed53fe886b19 that was accidentally committed