Roll back the unneeded API changes.