Revert part of the !1510 3.38 backport
According to @feaneron, these were not really intended for 3.38, and causes regression and UI changes. Thus revert all but the last two commits, who are still useful, from !1510 (merged) on gnome-3-38.
According to @feaneron, these were not really intended for 3.38, and causes regression and UI changes. Thus revert all but the last two commits, who are still useful, from !1510 (merged) on gnome-3-38.