Revert "Merge branch 'js/notes'"