Backport adams promotion changes.