issue #19703: basically backed everything out