Resolves an issue where the Update Assistant endpoint would fail because
of lazy loading changes introduced in #1050