Fixes #5985

And because it was such a minor change I also dirtied down the maintenance tunnels even more.