Hopefully finish fixing bug #49139 - track down another subtle hard coding of 512, and switch to using the big block size variable