AA: fix menuconfig segfaults; backport of r33773