MBS-6101, fix bad merge.