Revert "repackage for 5.3.x compatability"

This reverts commit 671af55d1b9156a1ff39dcf2e6d7c5b50376f926.