This reverts commit 4df591b5c960affd1612e330d0c9cd3076c18053. Causes crashes, see comments on D105921.