Revert "Merge pull request #523 from shanselman/patch-1"

This reverts commit 0aeefb48c0ac885a516fb92f7f5bfd7e85ce7a37, reversing
changes made to 81b7b3c64a92c4f16fb729c31f1516d373b32658.
Revert "Revert "Merge pull request #523 from shanselman/patch-1""

This reverts commit 706ecc9e29b9efeb809192b4a74e1e4da0b5ac66.