Experimental hack to fix Lion-&-before.