Revert "Temporal patch to fix genlist issue"