reverted revisions 4310 and 4311.