Revert "Major SQLi changes"

This reverts commit a267c30fe9471400a45e9072dc4284a0e9e8bc3b.