Merge "Revert "API tweaks""