This version corrects an issue with our attempt to rebuild if certain
environment variables change.