Reopen #2689
Reopen #2689

This reverts commit 522ebca7d1ea2fc646bb40002352126ee4a6d89e.

creichert/stackage,ethercrow/stackage,wereHamster/stackage,spencerjanssen/stackage,soenkehahn/stackage,fpco/stackage,stackbuilders/stackage,lwm/stackage,fimad/stackage,phaazon/stackage,mgajda/stackage,massysett/stackage,iand675/stackage,jonschoning/stackage,garetxe/stackage,Daniel-Diaz/stackage,simonmichael/stackage,michalkonecny/stackage,k0ral/stackage,athanclark/stackage,asr/stackage,clinty/stackage,Shimuuar/stackage,int-index/stackage,GregorySchwartz/stackage,peti/stackage,mrkkrp/stackage,mstksg/stackage,ygale/stackage