Revert "Revert "fix build""

This reverts commit bb0a936cf542deca5667f6cc2fbe66d70906a2ab.