if it's just called in 2.1 do we need to support it on the 2.2 branch?