Revert "second attempt"

This reverts commit 4af09c888cabac3951e20df036491cf99e139382.