Revert "Merge pull request #108 from cmeiklejohn/bugfix/csm/remove-deprecation-warnings"

This reverts commit 597d0f12fc4d2460aae9db81ecc929cdfd8e24b9, reversing
changes made to f715c2768396b0853e14f85d5e2d375e8dd39f05.