Revise my previous change 68996 as suggested by Duncan.