This reverts commit c14173f651. We should only annotate the minimum number of symbols that external consumers actually use, so I am starting from scratch to do that
c14173f651