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

This reverts commit 490c4b86c9be4a2c155fa9e0a03d839065e6c7a8.
Revert "Revert "Revert "Revert "Merge pull request #523 from shanselman/patch-1""""

This reverts commit b54a77ea870b736051e2e261ebd6e2336cf412ee.