CGIV-1650: really must stop copying/pasting