Rollback the rest of the botched r348521. Re-work would be posted to reviews. Sorry.
Reported by: Enji Cooper