Comment 8 for bug 85065

The change is committed to rocketfuel now as r3826.

I've also got a branch available to merge to production at jamesh/launchpad/rewritemap-prejoins-for-1.80 if you think it is worth cherry picking.