Removing the "fix" to merge with Tamir's change