This reverts commit bb8dbeb3a3.
Making this work will depend on having a new release of oslo.config with
the fix in the dependent patch.
Depends-On: Ia024722d05ce8adaa57c58559cb42f2913653bb9
Change-Id: I33b37c74abf63bcaa95e668ec74c9c9849cc3773
Signed-off-by: Doug Hellmann <doug@doughellmann.com>