revert a few changes from a different branch
revert a few changes from a different branch

CrunchyData/crunchy-containers,CrunchyData/crunchy-containers,the1forte/crunchy-containers,the1forte/crunchy-containers,CrunchyData/crunchy-containers,the1forte/crunchy-containers