Revert "take 2"

This reverts commit 48e0adc96d97140b6b2eae922416fcaf4efe948e.