Still trying to work around maven-release-plugin bugs