Revert back to a working version#538

kuettler wants to merge 2 commits intopixie-lang:masterpixie-lang/pixie:masterfrom

kuettler:masterkuettler/pixie:masterCopy head branch name to clipboard