Another attempt to make this pass on Mountain Lion.