tmp fix for broken migration

Until we have a fix for [AGPUSH-1075](https://issues.jboss.org/browse/AGPUSH-1075), reverting the fix that broke the deploy to fresh/clean WF/EAP

_Please_ merge to MASTER and 1.0x