Revert a fix from another branch that shouldn't be in this branch part 2