Revert "Use edit vars for instrinsic width and height"

This reverts commit eea8113a99c0e78a16be298d6ee87a93b30800f4.