We don't need this branching here anymore.

Change-Id: I5253e919b85d66fb826eb76a8369f928611644ed