Partial Revert "Partial revert of Babel"

This reverts commit 8f77d3e094c568692ff896ae496fd7352d260532.

Change-Id: Ia67b07fbdaa4c5ed6d642d70ab8829125165cef2