[jboss-dev] Revert 80237 from AS trunk