Revert "Merge branch 'backport_latest_byzantium_0.3.0-2' into 'pureos/amber-phone'"

This reverts merge request !5 (merged)

It would've been better to only backport select fixes as the new release brings some (as of yet) unresolved issues/crashes.