Revert "changed around uberjar stuff"

This reverts commit cf31af23a0ddd85241c989b136197223536d6eb3.