Revert "Merge remote-tracking branch 'origin/experimental' into objects_rewrite"

This reverts commit 619ee59c5a8e890723b786db7b60001fbe7db13b, reversing
changes made to 830a35b71deb7cc1ff37de26ef3effc3987dabb4.