Putting back some of the stuff removed while rewriting internals.