Revert "This is getting old"

This reverts commit ee11b169ba18dffde9c2d47a3bb08824e18c1daf.