Make opaque key change backward compatible