Revert "my solution"

This reverts commit f0a30989ccf3e2e3bfa0035b3467359a8145cb39.