Revert "Added from Kari"

This reverts commit 04154304614798c952f9b0050489361f8d522544.