This reverts merge request !25476
Add a masked switch to variable rows Copy some behavior from the protected switch