Quick fix to broken merge.