builder: bring back @-units