If you decide to drop the mysql->h2 change, you might still want to correct this part (unfortunately I didn't put this into a separate commit)