This is a github issue... not part of this patch.