Switch back to native implementation