Revert "remove cruft"

This reverts commit 91a2ad90b7e840a7e756a4313e55fe21173818dd.