Revert "Attempt #2"

This reverts commit 6ad7de1a976085e1c3083745cddbab73bb7f1389.