follow-up to r111861, fixing classic skin