revert SqlHandler to commit 61d10e8