Revert some experimental code to the original
Revert some experimental code to the original

Some things I was experimenting with snuck in by mistake so this
commit unrolls those.

oubiwann/lfe,bsmr-erlang/lfe,yurrriq/lfe,jjl/lfe,arpunk/lfe,yurrriq/lfe,jjl/lfe,arpunk/lfe,bsmr-erlang/lfe,oubiwann/lfe