backout 5a84a1907654 (bug 1042881) for causing app startup failures r=me