Backed out changeset 5d4d19ebcd70 (bug 922924) for B2G debug bustage.