Revert "Attempt 2"

This reverts commit d4ae1691d9d002ea6b31b15dc05f02a10ff1a1b9.
Maybe this