Backed out changesets bc3b048b416d and 773b27cd166b (bug 1050122) for regression B2G debug test runtimes dramatically.