Revert "Merge pull request #545 from guardian/reduce-conf-polling"

This reverts commit 8ff8ca5861c34dfd5db2a0e03325e9a4d574a58e, reversing
changes made to fcd968deffdb4291c258d2dd6511977aff7416d0.
Merge pull request #547 from guardian/revert-conf-polling

Revert "Merge pull request #545 from guardian/reduce-conf-polling"