Manually apply #1369