Attempt 2 to fix building on 10.7, 10.8