Causes failure in TestMasterNoCluster and TestCatalogJanitor This reverts commit ce65db36c4ed21331ae22345d33424439a9dda75.