diff --git a/common/polkit-parsing.sh b/common/polkit-parsing.sh
index 40e8cc8cfb4399512c806f7b0e696fba8a5bab0f..1b8086c742c9ef24681db72d5b3f1a807a8229f3 100755
--- a/common/polkit-parsing.sh
+++ b/common/polkit-parsing.sh
@@ -34,10 +34,8 @@ fi
 ( set +e; sudo ${polkitd} --replace 2>&1 ) | sed 's/^/# /' | tee $TMPFILE &
 
 # Wait for it to start.
-# FIXME: This should be replaced with something non-Telepathy-specific later.
-# Like upstreaming mc-wait-for-name to gdbus.
-DBUS_SESSION_BUS_ADDRESS=unix:path=/var/run/dbus/system_bus_socket \
-	mc-wait-for-name org.freedesktop.PolicyKit1
+gdbus wait --address unix:path=/var/run/dbus/system_bus_socket \
+        org.freedesktop.PolicyKit1
 
 # Query for actions, which forces polkit to parse all the policy files and
 # output warnings if any are malformed.