Revert "Take 2"

This reverts commit 2cc541fc915c1ba667f7fe6aac12fe83516ac0a3.