Duplicate changes made in 25802a17275c13927caef21a6d46d0db4639fa66. See #774.