Revert "Batch"

This reverts commit ed7f82dd0ebfd8c3137ca831d703154373597630.