Revert "Adopt vanir complie flags"

This reverts commit e8d2720b12eb0fc79871de6e34dff3a7ad672e6e.