Revert "Revert "well that was fun while it lasted""

This reverts commit bce497d7969a1149bd6c78a16bfbd796a8eea881.