Revert "Merging origin/bob/master-pending/pr63-locationChange-param into master"

This reverts commit 09b1e063c3cc5c4b1a5e9d291fdf738a50e1a548, reversing
changes made to 0cd96b91d371ab31d5639ae567ea2064617fa8ec.
Merging origin/bob/master-pending/revert-historyservice into master