I know you left the commented code in because of the CdnInfo work we did earlier, but I would document why you left it in so that someone else coming through doesn't just remove it. What I would do actually is put the original CdnInfo implementation in a comment of the method.

```
/*
 * We can't return CdnInfo at this time, but when the time comes this
 * is the implementation we want to start from. It will require changes
 * to thumbslug.
 * public CdnInfo getEntitlementUpstreamCert(...)
 *  INSERT FULL BODY OF METHOD HERE
 */
/**
 * blah blah blah
 */
INSERT CURRENT IMPLEMENTATION HERE
```