Restored Leopard compatibility lost in previous commits