Revert 19304fe63b26630f95c6f3a7da49349b433d476e