Reverted too pervasive padding fix