reverting part of #107

yeah that change was a bit risky, might have to revert this totally
again - lets try this first though.