Revert "Simplify merges of the annotation code."

This reverts commit 3270531c983397fccc1d48e3de0a3e47c13b4bd7.