Remove code introduced by FOP-1069 that causes shorthand handling regression.