Partly reverting patch 1104 (where stopped using PoolAllocator).

Now the hierarchy building is a factor 2 faster than previously. (And
as fast as in the beginning of October 2009).

[[Imported from SVN: r1153]]