(#2008) - use es3ify

this adds es3ify and also fixes all the old work arounds we had in place to get them to work