Revert "#452: use full name in the 'waiting for %s to stop' message"

This reverts commit 52f26d85f68c73bb4755eaf09c4f73615c7d591e, which broke
travisCI.