Replace packaging with something more normal