Partially revert previous commit