This reverts commit 32ae50af. I needed to revert this because 3.6.8 is breaking jbossas4. Please see #655775.