Yep, we should discuss this tomorrow and find a better solution for all the things that result in an aabb change.