This reverts commit 7255e20eee. This change has some problems ... working on a better solution.
7255e20eee