Backed out changeset 6f1696df360b (bug 1101331) for suspicion of causing breaking B2g Mac OS X gip tests on a CLOSED TREE