WFLY-1904 Probably a cleaner approach