[KRACOEUS-8577] Remove more workaround code that now has fixes from rice