Disable optimization until fix overrides can be fixed