Restore some missing code.