Prevent working nodes from being removed on revert

Fix #223