edX Solutions Team: TNL-362 fix

Please see background discussion in JIRA ticket TNL-362 for information on the purpose of this PR.  No longer certain this update is required with the new opaque keys logic, and I'm hoping we can continue the discussion started in JIRA here.  @dmitchell you might be able to yay/nay this change pretty quickly after seeing what it's all about.