This retries the compatible parts of the previously reverted PR so we can continue to update related code without breaking backwards compatibility.