r26540: Revert my previous commit after concerns raised by Andrew.