Partial reversion of commit 8b2006495ecad523da5bfb9c84ebb4f9868661a0
Partial reversion of commit 8b2006495ecad523da5bfb9c84ebb4f9868661a0

(cherry picked from commit 2bcf6042ec774c589ec2aefc9be5bd930e5fb6cd)

Esri/local-government-online-apps,Esri/local-government-online-apps