reverted to mainline scintilla