Delphi XE5 adjustments.
Fix an inadvertent reversion.