Revert "HSQLDB Changes"

This reverts commit 3053dcbf673aedf327e3e2fe673ed735ff19994f.