Revert "Merge branch 'usertrack'"

This reverts commit 5b14fcc42e16454b4cec71dcc409bfd3701476b6, reversing
changes made to fc09cc7771b9cf1a0c369ec81b7f583c4062c67b.