Probable fix for CURRIKI-6070. Sry 4 trbl, this was already fixed in 585f7fc and overwritten in 6b099f2.