Fix build breakage, missed committing a chunk of a patch.