removed workarounds for https://review.openstack.org/#/c/88382/