Revert "Messaging local host"

This reverts commit 143b3ddbbfd91d3e5e6f8011ede8fbb335c19dfe.
Re-Commit for Bin issues