Revert "Fix for authentication in a HA setup"

This reverts commit d507e8052b171adc7416bdaebdff7863b206fdbb.