Reverted experimental stuff that accidentally got committed.
Merge branch 'master' of https://github.com/jkbenaim/cboy