FELIX-4679 - Revert patch for FELIX-4671: - revert patch for expression support as the parser couldn't cope with the double parenthesises properly for non-expressions.