This reverts commit 20b2acf336, reversing changes made to f185cc0ca5. Merges should only go form the release branch to master. For backporting commits, use cherry-pick.
20b2acf336
f185cc0ca5