revert stack changes, broken on hardware :(