Revert "Merge pull request #2043 from sensibill/3.8.x"

This reverts commit 715ed598cc19eba63bf7c32b03db85a04ba48e28, reversing
changes made to 45c3ac34b8f92378816c796c12c17c61d73d9265.

Conflicts:
	docs/guide.jade
	lib/document.js
Merge branch '3.8.x'

Conflicts:
	lib/document.js
Patch #2043 into master