Undo these changes, I am going to discuss this first so that these other
bug fixes can be merged.