Remove critical path from rollback enable to fetch select