Crashes were introduced in commit 9d803829.
Reverting this, to have a second look.