Removed more code left from initial transfer to this
separate extension.