Backwards compat for #3118