Revert/annotation

This MR reverts fbcc8168 as we found several issues.

Merge request reports

Loading