Backed out changeset 716e54fb5d09 (bug 900201) for debug B2G bustage.