Rollback SavedSearchFactory change [MJ-400]