This reverts commit e6ba7c6e40. The original issue is fixed by Clutter commit 64c7973c7429c.
e6ba7c6e40
10884ef7f5