Use short hostname.
Add an `unbundle' script