revert hazardous part of r26957 and add a comment, take 3.