Revert custom meson fork

Once test don't fail sporadically (or once we have a correctly running tsan test suite without false positive) we need to revert the changes introduced in !451 (merged)