*8538* revert previous changes to payment templates