Made compatible with changes in S/C master.