Apply core globalize fix 2450. Fixes #361.

Same fix for 2-1-stable going to master.