I was not really sure about this change, I think it "should" be uncommented. However I also think this would/could break some things. That being said I added it as a comment so somebody can comment/fix this.