Remove hard dependencies on trunk-SNAPSHOT