Fix merge conflicts between #898 and #895.