[KRACOEUS-8577] Remove more workaround code that now has fixes from rice
Merge pull request #1327 from bsmith83/rice_overrides2

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