(#1289) Begin work on preventing websqlmageddon