Revert "hi-jinks"

This reverts commit 4ecc54870ef163a0294a7fd1b8b67808efbedd9a.
Revert "Revert "hi-jinks""

This reverts commit b0324564109883062bdea345f25bddd3fc3dd159.