Apply the 3.5 alpine variant changes across the board for 3.x (now that they've settled)#82