Fix build

Cherry-pick error caused in commit SHA1 cfd05701e