Only for 2.2.x

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>