Partial Revert "not my finest hour"

This reverts commit 5c982be9689cb7ad733672508eff71d9238fdeed.