This reverts commit 4d4271522078d0b0a69d58b81315e32b2b37dcaa, reversing changes made to f09ab8889148c406551dea1643966e3331fde4aa.
This reverts commit f09ab8889148c406551dea1643966e3331fde4aa, reversing changes made to effc761e0ee4ea7ffb77f275b5ed650a7098d6f8. This is being temporarily reverted to make it easier to release an urgent fix for v10.15.1.