Remove r264317 by accident.

Spotted by:	Kuan-Chung Chiu
Garbage-collect a couple of unused identifiers.

MFC after:	3 days