Back out 8be2344dcff3 (bug 1089008) for OS X bustage.