Fix cherrypick conflicts (was used to remove commits where my API key was visible before setting this repo to public)