This reverts commit 4e57e7f7. This actually broke gnome3 and didn't fix anything, I failed bisecting.