Another attempt to fix the version replacement stuff