Revert "take 2"

This reverts commit c447586379f140dd6f4975a6aa4d369a4dc697da.
take 3

take 3