The goal of this issue is to revert 436aafd3e2ef1a8f5998b974a9791b59939f57ad without breaking CI builds.
The goal of this issue is to revert 436aafd without breaking CI builds.