Partial revert previous commit