I have closed this issue because it has been inactive for some time now. If you feel this still deserves attention feel free to reopen it.