Done for 1.6.4. Pruning is faulty.