09a0670cb6
This is possible because of the update to HSQLDB 2.6.0
This reverts commit eb7b27695d.
Closes gh-8782