[#1451] add back in rstrip