Partial revert of previous commit