am 26aad174: Merge "Don\'t delegate to Quick anymore."

* commit '26aad174f2e369840a39e3142da3f5f0b7d0f950':
  Don't delegate to Quick anymore.