Rebase on proper 2.x branch.