Revert invalid merge for AWS STS token