See merge request !3675 (merged)
(cherry picked from commit 302440ff)
4457bf8e Drop unwanted dependency on Gen/DecFiles