Rewrite to accommodate #172.