Unbreak the ABI by reverting r268494 until the compat shims are provided