Revert "trying another approach"

This reverts commit 4fad344068745ed1eb584ffb8f7ea188d9d2a425.