Revert "Attempted hacky workaround for #2964"
Revert "Attempted hacky workaround for #2964"

This reverts commit e267370fbc60852ff6f1187cc11138481f98362a.

Fuuzetsu/stack,MichielDerhaeg/stack,mrkkrp/stack,AndreasPK/stack,MichielDerhaeg/stack,Fuuzetsu/stack,mrkkrp/stack,martin-kolinek/stack,martin-kolinek/stack,anton-dessiatov/stack,juhp/stack,AndreasPK/stack,juhp/stack,anton-dessiatov/stack