forgot to cherry-pick some changes