This reverts commit 9c94236e. It didn't server its purpose, so lets go back to long-time working code.