Backout Bug 837042 for mysterious compilation failures on TBPL.