Fixed the broken build post merge.