I didn't have any more trouble with HSM performance, and I am happy with this hack, so +1.