Temporarily disable parts of the Dict support