Revert "Merge remote-tracking branch 'origin/Nightly' into Nightly"

This reverts commit ca14b983a6435caa4add65c13800f6e547640f05, reversing
changes made to 0717442e1b0b8ae9b34d16d9822a85a64f1d886b.