Removed the double SQL changes since they're in 4.1 now.