Merge branch 'revert-3c2f48b7' into 'master'

Revert "Merge branch 'pere200' into 'master'"

See merge request ae/Sith!139
1 job for master in 5 minutes and 55 seconds (queued for 1 second)