Revert "We no longer need to expose 5984"

This reverts commit bddef894215e8e7b28863243584b4f658d43c9f5.