Applied cf6a8d687d to Singleplayer.
ported 2556d9d30c to singleplayer
I don't even... merge/conflict failed here, sorry.