re #8884: Fix loading larmor data

Fixes the side effects of #8438 in the loading larmor data.
Merge remote-tracking branch 'origin/bugfix/8884_loading_larmor'