Undoing bug inserted in last commit...