Backport fix for bridge methods from e8deca4