This reverts commit ae9cd7ca01. Pushing this for now so we can get gnome-shell working again without memory corruption. Let's push a proper fix later for everybody.
ae9cd7ca01