NO_VERSION_INFO is not in scope here.  plus it is changing semantics.  reverting this one line change.