Restored some stuff that'd been clobbered in a botched merge.