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