Shouldn't this be wrapped in start/end change markers (including the new implementation replacing the commented code)?