Revert "Reduced jar footprint"

This reverts commit 797fdfa3afb220a898354dd9a60c16780718239b.