Make https://issues.jboss.org/browse/FORGE-86 work again. Testcase
pending