Revert "Use CM Calculator"

This reverts commit 1f270fc3ed26fd3063f71ae3478842825b9e7651.

Change-Id: Iad183ea3f4a1cf1593a2039961d5fa8518c6e4f9