Issue #3314491 by VladimirAus, Christopher Riley: Split D9 and D10 branches as classy removal breaks functionality