Actually implement #579

Oops.