Revert "Use separate version constants"

This reverts commit 99f546fe708d354d0093c7ead058f4b9086d6356.