Fixed one more thing that didn't auto-merge correctly.