Revert the change in r18404.