I've addressed this here: a9540a5