CGIV-1650: must stop copying/pasting