Revert "Add carl's change"

This reverts commit 4cde57151d8ea1b3b341d35f8ef994cbd7e3ea7f.