Revert "Automated untracking"

This reverts commit 2b6223d7bfa5009f12f16293408a79e4bc123e15.