This reverts commit 6cd9530862, and reopens development againts GNOME Shell master. Time for 3.2!
6cd9530862