Revert "2nd attempt"

This reverts commit 82b54007d46de54caadb9d49a335f098aabffc5d.