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