tgtttt "Merge branch 'new_branch'"

This reverts commit 0bad19dbbfcee728a633091bc454bb4010d571e0, reversing
changes made to 28de9a110c0c94c2b372efa47eb0b76f967431de.