BZ 1058233 - Handle Portal versions newer than 6.1.1 the same way as 6.1.1