Fixing a messy merge.