Revert "commit 7, new try"

This reverts commit a659e7466c2ebdcc12b1ff3bf18cff08570b964c.