Re-enabled raw code