Be smarter and only call the versioning piece if we need to.