Revert "Merge branch 'new_branch'"

This reverts commit f6261d1676f59380e29ba226f37af67cf1bec598, reversing
changes made to 1c7f33fe9f9736c9e19bcc0a4042ba5350f1faca.