And here's the patch without the sanity check.

Aldy