backport tyop fix from head