Switch to Google reference implementation