Cleanup: Move local TM population to upgrade machinery

This ammends commit ad3210af42