Revert "Changes to smallbatch by Trent"

This reverts commit befc9e918cec1840135dc39a4b992e96c0712a68.