Revert "Merge remote-tracking branch 'origin/Release'"

This reverts commit 0f9ed01b54596e4fdc5d56a6d48fb081c091f889, reversing
changes made to 75f07d42c0c89ec43db0a51c83be8bd7a0b59700.