removes a temporary fix
Merge remote-tracking branch 'instructure/CanvasKit/master'
removes a type declaration error
Merge pull request #15 from derrh/master

Remove a temporary fix