Revert "Merge branch 'master' into 2.0.x"

This reverts commit 99e3d42a09d2cc11109bd80bade41fc42755e1ec, reversing
changes made to cf754b7698d2b559efa816eaddf7fd4cfafbbb32.