Fix bug 1538463.

2 files changed