This reverts commit d453a03a.

For whatever reason the simulation does not work anymore, I have
to revert this commit for things to work again...