Fix #1290 for 3.8.14.1 branch.