Backed out changeset 2a4cde9c1130 (bug 1015332) because it breaks the Firefox OS homescreen, among other things a=RyanVM