Revert "Merge remote-tracking branch 'origin/master' into 3.0.x"

This reverts commit c69d9514a9e96ff9453c66e24ae7488f0a101897, reversing
changes made to 4ef1974c6d46e566d350df98c0a3f1c37a15cb99.