Revert premature merge of metadata branch

This reverts commit 732c7550351aa73c988295a21d4340db1c856f94, reversing
changes made to 18305a720400d2e72969cebae9c612544aef7238.

I accidentally merged changes intended for the metadata branch. This undoes that.