Modified sources to use the repackaged jars #3266