Bring back BlockFluidClassic in a different approach