Revert "Pupil persisting problem"
This reverts commit 57853172b5a545ed71b9c36c8a874e98b998c5c1.
Revert "Working at last"
This reverts commit 1bbd25fae3be299db961efe0c38a5ae048e89171.
Working at last
Pupil persisting problem
Trying to set up a test case for #629, new problem with "silent" crash