This reverts commit e0e69d35b2.
Reason for revert: causes more JS errors
Change-Id: Iceef32eb2f858d7b28e1e173d63c060c4407c2bd
This reverts commit e0e69d35b2.
Reason for revert: causes more JS errors
Change-Id: Iceef32eb2f858d7b28e1e173d63c060c4407c2bd