Bring back the fluid handlers