[samatman]

With the additional advantage that the original rules need 2d4, but only once, at the very beginning.