CS-4850: Straightened out this file, conversion from previous version didn't go well and
broke functionality.