Backed out changeset eaa0d64e544e (bug 996998) for B2G bustage.