Seems there was an issue uploading the patch?

gotta run, but above [just removing the define] actually fixes it here :)
[assumed that each time expanded is set, it is also doing it for cameraclip?]

@Campbell Barton (campbellbarton) : could you check again?
Like I said, not sure if this is the right solution (and what the define was used for), but if this is wrong I can try something else (or abandon the whole thing...)
It does fix the issue here though.