Revert "Merge branch 'stable/havana' of https://github.com/townbull/keystone into stable/havana"

This reverts commit 1a86dabd5b0c645723201866be272930db42a0cc, reversing
changes made to 0d83e7eee20a50a75863a9d3c75aee7030518229.