Backed out changeset 0964acec6851 (bug 978639)
Backed out changeset d4a7883e0e92 (bug 978639)
Backed out changeset b20c4afb0c7e (bug 978639)
Backed out changeset b64604a829ff (bug 978639)
Backed out changeset a5c28b69a261 (bug 978639)
Backed out changeset 48b004974cd2 (bug 978639) for breaking non-unified builds on a CLOSED TREE