This reverts commit 61940b89a5646987e8b7a8fe7277ec7534c957b1 #62340. Apparently it's not needed anymore after the update, so let me clean up.