Revert "changes from calculon"

This reverts commit 7bda8cf5d5b8065e903f30b0f5757f096d42b7ce.