Reverted a few unintentional config changes.