This reverts commit 9c64ed75.
According to @nemuii this should fix the issue with high memory consumption on nightly.