Partly revoked unnecessary template changes from r11827 (fix #867 - set primary address during checkout)