This reverts commit 2cd0edaa47. This commit was the cause of a memory leak. See ticket for more details. Thanks Anssi Kääriäinen for identifying the source of the bug.
2cd0edaa47