Fix brokenness after the config settings change.

This is still really ugly, will have to come back when there's more time.