Merge "Re-add incorrectly removed API"