@kborchers I went ahead and [AEROGEAR-829](https://issues.jboss.org/browse/AEROGEAR-829) for this.  I think we can live with removing the where clause for now.