This reverts commits 318175cfe2, e7ab760392 and 3b35af63f6 (PR #11537).
318175cfe2
e7ab760392
3b35af63f6
brew style