am 2ba44e16: am 2cebfc68: Merge "Revert "Quick: Work around large frame sizes for x86_64.""

* commit '2ba44e16ba71d8411c32dc298f7741f84b31b083':
  Revert "Quick: Work around large frame sizes for x86_64."