Backed out changeset ae8d72538dee (bug 897484) for b2g bustage