Comment 1 for bug 1202735

I suspect our "fix" will be reimplementing these bits when we make the new system. We'll hope to address one way or another when we get there, anyway.