This reverts commit 3149be35. Commit does not comply with Commit Message Guideline. Please go through Phabricator review for this commit on second attempt to get it right this time. CCMAIL: yurchor@ukr.net
