Revert "Merge branch 'Doomsdayrs-master-patch-14516' into 'master'"

Morten Welinder requested to merge revert-eb749edd into master

This reverts merge request !24 (merged)

The commit breaks the build.

Merge request reports