Sponsored by: Netflix
rebase / refactor / redo
Squash into D38249 and abandon this one now that it seems to just be the one?
Fold back to original code that added this