Fixes #1349 for 3.8.14.2 branch.