consistently remove domain from short hostname

Signed-off-by: Dmitry Borodaenko <angdraug@gmail.com>