revert r8001 (costs ~10KB)
make ParsePadding also accept one or two values