re-add config boundaries