This is a year in the making, with a security patch motivating it.

[ci skip]