Revert "Crazy branches!"

This reverts commit e793f7a953d29a79a5aebc8fff33e04355a41732.