[KRACOEUS-8477] Reverse workarounds that are now fixed by Rice
Merge pull request #1238 from bsmith83/workaround_fix1

[KRACOEUS-8477] Reverse workarounds that are now fixed by Rice