I thought we added - https://github.com/Katello/katello/blob/master/app/models/ext/indexed_model.rb#L42 to handle the case universally across all models?