CS-4850: Straightened out this file, conversion from previous version didn't go well and
broke functionality.
Merge pull request #409 from m038/CS-4850

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