Revert "Temporal reincarnation of removed API"