Revert "Merge branch 'master' into new_branch"

This reverts commit 381b7a150011fcc8476e020c69a86a37763c1a7a, reversing
changes made to 1516c9b328dd946f4ac6d0b7737ff1db30c1b206.