Unbroke the build... cross-versioning kills me!