Fixing yet another issue due to a bad merge.