Merge "Undo arm64 workaround."