This reverts commit d1e87eb3ba. 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.
d1e87eb3ba