Revert "Trying another approach"

This reverts commit 8a107a5faca8084ab67c5f685fcf0149a6b1bfa4.