Fix the regression and make the previously added test pass.

1 job for 317808-fix-frame-refactoring-regression in 5 minutes and 35 seconds (queued for 1 second)