Revert "Merge pull request #18421 from Rik/always-contact-home-994575"

The two commits should have been squashed

This reverts commit 1683d067d744af8a7a739d4a96dfee85962b529d, reversing
changes made to 0fd7a3b6de70bd9941b24a3b6c83cbc69f84d628.
Bug 994575 - Add a call should always display the list of contacts

Some code movement for JSHint cleaning