I agree, and the bug in the report is likely not the only one caused by these changes.