Fix for Native Client
Reverted trivial changes to simplify merging with upstream