am 5b739d81: (-s ours) am 3d3c1985: disable mr stretchy, but leave the support code around for now

Merge commit '5b739d8102982d24924aae0dbbb74b9fbc1c46ae'

* commit '5b739d8102982d24924aae0dbbb74b9fbc1c46ae':
  disable mr stretchy, but leave the support code around for now