Revert "commit"

This reverts commit b0b3dd22c74c79bf5fd337b0469e6d429c14a279.

Conflicts:
	sim/sim.c
	sim/sim.h