Keep up with core.

- Fixes issue #1002.