Artifact undeployment not using classifier/type info

When deploying an artifact we first try to undeploy the previous version. This is not currently taking into consideration the classifier or type. The result is that if artifact.jar is deployed followed by artifact-classes.jar, we end up undeploying artifact.jar!