Revert 48bbf4e..50ccb60

This rolls back to commit 48bbf4e251ea27e76d3eca4edfb2daf49332d979.
Annotations now show up when recording.

Bugs: getAnnotationsByNote() still not working.