Revert "Another attempt"

This reverts commit 3dc5ba8fc0685b662def22dd218a2df4cf083ac3.
Try again