Bug 937336 - Remove explicit frame switching