Duplicate of https://issues.jboss.org/browse/PLINK-636
We need to close this. I forgot I created a jira for this already.