Revert 84 85

We should discuss how to merge these changes into the new itext widget