This reverts merge request !26430

There is nothing more to say but

"Commits that change 30 or more lines across at least three files
must describe these changes in the commit body"