In general, this is accompanied, git-style, by putting the `foo-bar` versions in a directory *off* the default path.  That, I think, makes solid sense here, and you should fold it into this commit.