This reverts commit 9505ee89a3. Fixes #38214 Signed-off-by: Christopher Friedt <chrisfriedt@gmail.com>
9505ee89a3