Fix a second minor merge issue

Auditors: chad, btrahan