Revert "Merge branch '3.3.x'"

This reverts commit 5ceba393e20024f6fe5ebd1cc06eebbf44fdd3d4, reversing
changes made to 1a46bfb2fd930a76b11371e8f94d43f464992840.