Backed out changeset 3263cf8aca77 (bug 1033952)
Backed out changeset c78cc72ea6d2 (bug 1033952) for bustage