debugging
Revert "Special case debugging better. hostname might not work for"

This reverts commit 0d6c923babfe4dd5ee48937f359869587b5210c5.