Counted down to 20120306, please push, although David and Neil have
suggestions on Rietveld which could lead to a followup patch set. Calling
for the push on this as it's marked Critical, and the suggestions sound as
though they would improve the design of the patch but not the function.