fix compilation from cherry-pick