Boar fix
Revert "Boar fix"

This reverts commit 32fc0513ce1e64ed9ab2513dd5acf387bd664718.
Revert "Revert "Boar fix""

This reverts commit b9392776bf304efa14118c8553a4924cbd497a1f.