fully collapse annotations again

fixes #320