Picking up the Fallen Mask: Breaking and Fixing the RS-Mask Countermeasure