Revert "Merge branch 'master' into Test_branch"

This reverts commit 85c1288af4d748256d76c20b00fc1de890657de0, reversing
changes made to 49371fe76a04294fda30d217be9e59a55ca86c07.