Merge "Revert API removal"