revert r25133 which was fouling up the tag panel