#648 could make this obsolete.