partial rollback of ec6754262863475136c6a53b012eb7b0bb62d7ba to fix skinny breakage