Backed out changeset 9b26ce378971 (bug 1052371)
Backed out changeset d04a9bf0df24 (bug 1052371)