Put pi constants back in for backwards compatibility.

This reverts commit 5ac1e84504664e16efcdb908faa70d30963f8cbe.
Removed unneeded constant and casts.