FYI… This patch is the answer to BZ#13783.