Revert "padding in main fix"

This reverts commit 5977bfc1585f04982c85dc7f2cbf1e02beeda406.
Revert "fix"

This reverts commit 0f5c62286a888c425c4bda370604c03fd0b5ade0.