Merge branch 'revert-89d34992' into 'master'

Revert "Merge branch 'dev-loading-system_dates' into 'master'"

See merge request es/auto-s2s!47
2 jobs for master
in 13 minutes and 2 seconds, using 0 compute credits, and was queued for 3 seconds