This undos the changes to `JdbcAggregateTemplate` done by 7cf81ae. Since we are in the RC phase I opt against trying to redo the refactoring Closes #1924
7cf81ae