Backed out changeset 0191d92d4f42 (bug 918273) because it conflicts with bug 906877 which just landed on b2g. r=RyanVM, CLOSED TREE
merge backout of 0191d92d4f42 CLOSED TREE