Apply #2081 to master instead of 3.8