Reverted MS change.