GTNPORTAL-3313 Workaround for GTNPORTAL-2700 not necessary after
GTNPORTAL-3291