Restore config modifications related to #162