restore these for the moment, still in use in sc

Change-Id: I6967a3c871338d1801d913d9bb54eba50a7660ca