Revert "Attempt 2"

This reverts commit 25329d8ec5a3f7571fd61127bdaebe56c5f1a31c.