Fix merge error from a few syncs ago.