Reverted to ECMAScript 5