Restore changes to notebook.js lost in merge