Revert "Merge pull request #451 from underscorgan/maint/master/1.7.0-prep"
Revert "Merge pull request #451 from underscorgan/maint/master/1.7.0-prep"

This reverts commit a4f0c5accf452dbed9423436a45e13bae749a426, reversing
changes made to 24fd83fcccb3d41feb85072149d56c2b034da405.

puppetlabs/ezbake,puppetlabs/ezbake,puppetlabs/ezbake