Revert #50b0568a and fix duplicate branches.

The proposed patch fixed the duplicated code (by removing the
repitition) but did not fix the original problem.