Removed Pencil (upstream fixed)