Ok, pulling this line (it was in the original patch, not part of my edits)