Revert "collapsing annotations"

This reverts commit 05413763322729f260bf2766059929ba9375ffd1.