The prior commit was actually built using ES2 so I did not see
these issues until I fixed that build to really use ES 3.0.

Change-Id: I80315f7c665fa43d85a08d2ed4f7f5e528c5588d