FLUID-5205: removed alwaysFlag variable

The alwaysFlag was only used once, dropped it in favour of just using the string in the conditional.
Merge remote-tracking branch 'justin/FLUID-5205' into PFID