Reverting challenge chapter 8 changes that are on master.