Revert "Zanata changes for 6.2.0.CR1"

This reverts commit 2bb2966dd85282c3ebe77f739cde6bcd649a4e08.