Backed out changeset ce623d85f0c4 (bug 886110) for hoping this resolve the m7 b2g-ics permanent failure on a CLOSED TREE