Revert "Merge origin/master"

This reverts commit c7063879c1d583747ddf0bc8d2b971015c1192db.