Reverting to the version from commit dad3151b9420739e32ad7471d765fe54d5eaff1f, which was accidentally overwritten in my previous commit