CS-4850: Straightened out this file, conversion from previous version di...

...dn't go well and

broke functionality.