Revert "Merge branch 'master' into Test"

This reverts commit daf652ba135ce33330f1aa3d2430a21031b1d6d9, reversing
changes made to 087dbc651eb435c7118dbc53e312c782e42caf5d.