When we fixed legacy/trac#5969, we forgot to test merging the patch we wrote into master and seeing if things were fixed then. Turns out they aren't. Patch coming