Is this actually just the compiled output from the old code, or have you changed it? If the former, its still buggy. If the latter, please remove this comment. (In general, we should clean it up so it doesn't look like generated code)