Revert "Merge branch '3.0'"

This reverts commit a0f58e97bc28d1771a22ec91822a2b24698ec96a, reversing
changes made to 99671c00b040f64bbeb62abc5cc6f29082c1eefd.