Backing out 400d92d915f4 (bug 938186) for opt build oranges, r=me