https://review.openstack.org/#/c/58648/1

Chris, Everything in this file except this line is covered in the linked upstream patch.