This reverts commit 5e4ed8b3. Introduces a crash.... need to investigate.
mentioned in commit e5da5fdc