Revert "Revert "Fix build""

This reverts commit eea5df926c4e27d8b5cece8eaba840483a74a85b.