Revert "Second attempt, a different way"

This reverts commit d9c359112afbf74ad178383d0e2d16ee3019b233.