Revert "Revert "more junk""

This reverts commit 2d21f4bad25caa48fb87e0c6244d9dd9d62dfb91.