This reverts commit 9243ace4

There are some bizarre issues with notebook, which happen randomly.

/reviewed-on !463