revert the broken fix for #258

reverted commits:
	fd9739dabea39f932197efa1b06caa274fd3c5f0
	8c77f482b4df5b385d38535f89bb457bbc8f7495