I thought this would be the easiest way to get a proper diff; make sure to revert the 'remove' part of this commit; you may also want to cherry-pick the changes that propagate to en-US where appropriate
