Partially revert 15ac1e155e839745f923c2831bf080fd3fef6e86.