Reverted particle/fluid for backward compatibility