Fluid 4939 - Fix for double appearance of own default options introduced by fix to FLUID-4937