Manually copy changes to validator from upstream repo since the merge failed :(.