revert e6a4fd1ad407d9c07bf965fe682bbd858285a87a as it introduced a regression