Revert "remove cruft"

This reverts commit c2b5586b328628e1c84c5de74f021f12716fd3c6.