reverting commit 4572244c4cad960a09193418b898cfd20e47e59f

we use both "type strings" and "type descriptors", so we can't rely on
having the L...; format. TODO: move to only using type descriptors