diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index ff04be146..7372a10f9 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -150,10 +150,6 @@ class PresenceHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def is_presence_visible(self, observer_user, observed_user):
-        defer.returnValue(True)
-        # return
-        # FIXME (erikj): This code path absolutely kills the database.
-
         assert(observed_user.is_mine)
 
         if observer_user == observed_user:
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index 844c4e3fb..2eea47439 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -196,8 +196,6 @@ class PresenceStateTestCase(unittest.TestCase):
             SynapseError
         )
 
-    test_get_disallowed_state.skip = "Presence permissions are disabled"
-
     @defer.inlineCallbacks
     def test_set_my_state(self):
         mocked_set = self.datastore.set_presence_state