Restore definitions removed in b7b9882.