Fix lost 2i AAE tree on rebuild

This is a fix to avoid 2i AAE trees to be dropped on a rebuild.

/cc @jtuple @jonmeredith