Revert invalid merge for AWS STS token
Merge pull request #239 from opscode/adamedx/revert-sts

Revert invalid merge for AWS STS token