Revert bce52213ed6b