This was not picked up on a backport, so this commit adds the missing SHAs, and removes the old ones.
Jason Tedor