Revert "Merge branch 'next' into daniel_lazy_datum_deserialize"

This reverts commit 486ee9fd9064788e6079bc84fd6e68ccbfe8f88a, reversing
changes made to 5319789b13321ac0cfde653b53fed25574e7fb8b.