Fixed broken build after recent merge.