Roll back the stretchy fix