essentially yes - see my note on the commit