Revert "Revert "Revert "more junk"""

This reverts commit 6705c6aeffaf6df6abc691d653dfcfc87d7afc9c.