PIM-2492: Rollback on EntityFilter to make spec passes