JFC, fix the merge here, too