Refs #5693. Tidied up method.
Merge branch 'bugfix/5693_revert_custom_color_map' into develop