disable surf mode until we can figure out what to do about the clickjacking restrictions
Merge master