This reverts commit dbe6243d. This also revers the "check unified" mechanizm which basicly was just an assert.