Revert "Merge branch 'master' into patch-2"

This reverts commit 94eaa3001fa495309daab27ac99f77b8e1a2ca02, reversing
changes made to ae369eda2dccbb035ef557ff78d90dccf4022c52.