Change from deprecated upstream to simple