The rationale behind this change is explained in #563
Co-authored-by: Aniket Shivam <ashivam@nvidia.com>