This reverts commit e1c5c4da53110efbde122ba71206d7436d1169ee,
because it messed up creating annotations.

Interesting, because there should not have been any real change in
any functionality. I will investigate this.