Vanilla fixed this stuff a few months ago: the MR for it (STJr/SRB2!1698 (merged)) is pretty larj and unlikely to merge cleanly, so I went through and grabbed everything that looked like a fix instead of a feature.
I have no confidence that I did this correctly and I'm sorry.
