Revert "Merge branch 'Branch-of-Branch'"

This reverts commit d7d04d2b0de29211b938d5c3c2fe0742e9ef8102, reversing
changes made to eeada3a79692e1a1f2968c87f5ec05bc44499653.