Revert "Force batch save always."

This reverts commit ad2c81d24d8f760a1151ede68496622ada3e010b.