Followup to r70460: Committed wrong version of ApiBase.php, convert all core API...