This inadvertently broke some config schema stuff we don't yet have tests for. This reverts commit f541fae9.