Revert "Attempt 2"

This reverts commit ce0b3d3f2e3a7584df2b4e604bdf8b94df183321.
Attempt 3