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

This reverts commit 05ae9ed6e3c12334bd21c8c2af1919bc626e3e4f, reversing
changes made to 0c87485b78b5a4eeeb54a3a8ff4667fcb6b7fe4c.