Commit 6650fda680310e71b5dda7764bf4033f670d90f0 is no longer needed: https://review.openstack.org/#/c/46048 has been merged. This reverts commit 6650fda680310e71b5dda7764bf4033f670d90f0. Change-Id: I47d28a292667eb8ece2061c0ef19c7c925e5747c