Revert 3af0966..5935b03

This rolls back to commit 3af096697aa0b8151767316ae96caf8884472939.
recovered from some serious bug with eclipse