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