Revert "This is getting old"

This reverts commit 1ab922240477bccce6119e5871ba75cc72f1fd57.