Closes #1354. Fix SQL Syntax breaking 2.7.3 installs

This should fix #1354 and #1353.