Bug 906946, reset birch back to a normal rentable branch, r=hwine