Revert hcatalog changes from develop