Revert of a commit in 6.6-stable