dd4ad4efc4
The reverted commit seems to cause https://bugzilla.gnome.org/show_bug.cgi?id=787240 for some reason. Lets be safe and revert it for now, as the code freeze is just around the corner. This partly (it doesn't reintroduce a whitespace issue) reverts commit dbc63430d879c927f7e308e29e4570993eccbfde.