revert 54569 - causes problems compiling AHI.