Remove Babel version workaround code

Since Babel>=1.3 is required, code to work with earlier versions
can be removed and the logic made clearer.

Change-Id: I33f358912802fb1bd49ed377d974af9e213b9257
Merge "Remove Babel version workaround code"