This reverts commit decf122a [formerly 70bc02755eb2c0d36163afa582ef8338bb9b042e].

Conflicts:
	src/debug.c
	src/engine.c
	src/engine.h

These were fixes from the paranoid branch.


Former-commit-id: 158c336b03466a33192ba9df5517703185cde5c5