Revert "Revert "fix build""

This reverts commit 149ca70d68dad015dcea2a6649188012730ee75b.