This reverts commit 36305d7dce, which seems to cause an assertion failure on our CI machine.
36305d7dce