Removed junk left in the previous commit
Merge branch 'hotfix-2.2.32'