Revert "Attempt 1"

This reverts commit 14bde33f58e7a8a723aed7c7838f3a40e54d46e2.
Second try