more pre-boxen cruft