Reverted incomplete changes (accidentally added to ealier commit)