Please be careful with backports

[steve.dower]

I know I asked everyone to find more fixes so I wouldn’t be the only one, but please, you can all stop now!