Merge pull request #6501 from mikeller/remove_omnibus_feature