This reverts commit f09ab88891, reversing changes made to effc761e0e. This is being temporarily reverted to make it easier to release an urgent fix for v10.15.1.
f09ab88891
effc761e0e