Revert "Revert "fix build""

This reverts commit 60c343fed65b777c5c8dd3ea91eab159625af1b4.