Remove 10.8-only logic