Reverted fix related to MYFACES-765. Fix caused massive problems with the TCK. Revisit this after the 1.1.2 release.