Revert "remove excess baggage"

This reverts commit 97d4ef780a0d6ed78c4b68ef77c66c3b700bd981.