cherry-pick to get compilation working