This reverts commit 49e5fe185a.
reason:
- these changes are breaking the Manila UI plugin job
- there is a good chance other Horizon plugin jobs would also fail.
- more testing across as many plugin jobs will be needed before a revisit.
Change-Id: I76018c5eff71ed82b89e202957ab3f6ee9452369
Signed-off-by: Owen McGonagle <omcgonag@redhat.com>