Remove pre-2.3 compatibility shim