As part of legacy/trac#31356, we need to make 0.4.1 and later clients require Padding=2.