Added a comment voicing my doubts about this change...