Revert "Merge remote-tracking branch 'origin/patch-5'"

This reverts commit 56d5ab5b3128162e8d13b2a15f0ae193647f064a, reversing
changes made to f4bc72c9fa7b88a84448c034e3880b7c4d375339.