Revert "Commit attempt 2"

This reverts commit 5242858a94483bac1a68f7e6a62f47fe32be9c4d.
Commit attempt 3