Can you backport this change to gatesgarth?