Revert "Merge branch '3.0'"

This reverts commit 0d864acf083103ff73e6c308ba996b485f3535cd, reversing
changes made to 9ff44f2e4a64d8163941d5e8a850d31d2f24da54.
Revert 06e7860..608e302

This rolls back to commit 06e7860a52a71dfa859e244ecd5fd0af464f4dfa.
Revert a0f58e9..5007eb6

This rolls back to commit a0f58e97bc28d1771a22ec91822a2b24698ec96a.