Bad merge. Oddly not caught by autospec.