Backed out changeset 84c03250d7f6 (bug 1106936)