backout #19081 to fix #20621
finish backing out #19081
remove tests for #19081
backout 369bf9fbaeff