Revert to r17908.