Revert r257248 and fix the problem in a way that doesn't violate style(9).

Suggested by:	jmg