Comment 7 for bug 1164720

Bill's server side approach works for me. I've signed off and pushed it to master first.

Question, should we backport this to previous releases as a "bug fix" since this probably shouldn't be allowed to occur in those systems either?