Revert "d_zero and f_zero variables now depend on different #constants."

This reverts commit 0ac4195ce9300cfead429edcb4dfa38723e71ca6.