Trunk 4509

Do you really need this? Once you remove it on line 575 below, that should be all