This seems to work better outside of just Opus. Initial experiments look
promising, going to test internally for a bit as well.

Release Notes:

- N/A