partly revert previous commit