Merge "Revert "API changes as requested by API council.""