Reverting the change introcuced in PR #868.  This closes #869.
Reverting the change introcuced in PR #868.  This closes #869.

StevenBlack/hosts,StevenBlack/hosts,gfyoung/hosts,gfyoung/hosts,borisschapira/hosts