Revert "PKCS7 padding fixed"

This reverts commit 5c7ccc4730315cb5c3cd3931d5a362eef8e1674c.