Revert "Split metadata out for official sectors"

This reverts commit 1e78c4d3c2012065063fbd32c292465e8dfb791c.