Revert r256587.

Requested by:	zec
Revert r256587.

Requested by:	zec