Recover performance regression caused by 695e58d