Version variables seem to have broken the build.  Reverting for now.
May revisit later.