Remove outdated cherry-pick

This commit is no longer on any branch in the redhat-openstack/t-i-e
repository. It appears that the history has been re-written at some
point and it was removed.

Fixes #87