This reverts commit 57fd8665516161c3d2dbe3f0ad8461552967692a. Causes crashes, see comments in D132581.