Revert "Revert nova https://review.openstack.org/#/c/86643"

This has now been reverted in Nova so shouldn't be needed here.

Change-Id: Iba3eccdeb4cb8a2c9c9f9fe29e538dec7591415f