Merged from origin.
Revert "Merged from origin."

This reverts commit 1a127bd3732d802c1c4a88f218f9818141eb5287.