/!\ NOT UPSTREAM: two-step: Fixes for the hack patch

This wasn't 100% correct.

endlessm/eos-shell#3769