Fixes bad commit cherrypicking for internal step