Experimental fix for 10.10.2 14C78C changes