Comment 3 for bug 31589

I want to talk about the design of this subsystem with Salgado in London, so we can check out its design and document it better. I'll commit a trivial workaround for it meanwhile.