So much change; I recommend you not even bother with the diff.
This follows commit b5759c2a in both sequence and spirit.