Revert "Merge pull request #1 from tacahilo/chap2"

This reverts commit 3957f2ace9428ec03823f3fe14f8647d6690dbe1, reversing
changes made to 832649ad928069f26f874d9194ab0d823b4b4b78.