Revert "Attempt #2"

This reverts commit ce4c4e41278bb46f7b73ab55b7fba3edb93fc10a.
Attempt #3