Fwiw - webpay is still doing that currently which is something that's needs to be resolved in bug 10003922