Backed out changeset 48432355c9fb (bug 973932) because it shouldn't have landed yet