Merge "Revert "Quick: Work around large frame sizes for x86_64.""