oops
Merge pull request #3220 from edx/flowerhack/opaque-keys

oops