FIXUP - No need to patch the generated code anymore.