Jason specifically removed this line in an earlier bugfix needed for Shibboleth.  Does this have to be added back in?