Revert changes associated with closure compiler upgrade.