Revert part of the prev. commit