This way we can bump the versions without big diffs. (cherry picked from commit 5d2e062a84)
5d2e062a84