ENTESB-1017: Remove workaround for hawtio