Revert the padding fix