Revert "Partial Revert "not my finest hour""

This reverts commit 152d59d31ca04c5c72b2e40a534b7491b9c1d41e.