Issue #2853964 by mradcliffe: Add backwards-compatible version of core class because of API breaking change in core