Reverse changes in mysql.js, fix tests