This is the correct code where I'm talking about regression above. /cc @fblundun