Reverting change of batch action handling in template