The original removal is in https://review.openstack.org/#/c/167669/ Change-Id: I3c59f040523d2cd1453465e80280955218880634