Revert "* lisaarivi refaktor"

This reverts commit 2f6f755fae6aacdc9d3db216919962abc4c005de.