I've approved this now, because this PR does fix *one* issue, and needs to go in. It's ridiculous that this should be blocked because we have issues figuring out *another* issue. Let's take that to another PR.