Revert "Short term fix for #719"
Revert "Short term fix for #719"

This reverts commit 7bdc3b4cd2c15fd1fb8cca62c9f5b9aebf51928f.

itsyouonline/identityserver,itsyouonline/identityserver,itsyouonline/identityserver,itsyouonline/identityserver,itsyouonline/identityserver