Make last 1.12 release forwards compatible with 2.2 release.