Backed out changeset 0f7f99d0a2f5 (bug 968432) for bustage.
Bug 966881 - Fix style checker orange.