Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 37f5e29a8efdb83beb4cf490acba240b3bd99e6b, reversing
changes made to 9b72c81fe5d3c2c1b6936dfccbbe7c832bbfea55.