Backed out changeset c4bb530fc9db (bug 690937)
Backed out changeset 5bb66b16b70c (bug 996078) for B2G desktop build failures; CLOSED TREE