Revert "Revert "Fixes DEVELOPER-515""

Reverts jboss-developer/www.jboss.org#340