Revert "performance improvement"

This reverts commit 6db13589ce09d4b154b7fe526ace363897491a05.
make it readable
solves original problem