INFR-921: Workaround broken supervisor.public