Why aren't you removing these two lines? Doesn't seem consistent with the other changes. (yes yes, repeated code, refactoring...)