ADEN-1626 Reverting to the old way of handling TOP_INCONTENT_BOXAD