Back out 14789271ad20 (bug 853694) for frequent 10.8 and permanent ASan test bustage