Revert "Attempt 3"

This reverts commit 2a4a142ad54c496a0bff92382fe5dda52132a591.