Reverted commits from chapter 9 in order to get tests to pass correctly